Merge solution 01.03 to 01.06 to master