[MR,AP] {bugfix} merge with master complete