dimazelinskyi Merge branch 'update-to-spring-boot-1_4'